Expand css style font tests

Test more of the syntax of the font: shorthand.

diff --git a/testsuite/css/style/font.css b/testsuite/css/style/font.css
index 9c9962366593b07667a936f07859e57b6349c09c..b5bd402e8850e1d613a2399fa300b1325d3d5529 100644 (file)
--- a/testsuite/css/style/font.css
+++ b/testsuite/css/style/font.css
@@ -2,6 +2,22 @@ box {
   font: 10px "Comic Sans";
 }
 
-label {
+#label1 {
   font-size: smaller;
 }
+
+#label2 {
+  font: 10pt Cantarell, sans-serif;
+}
+
+#label3 {
+  font: bold italic 80% monospace;
+}
+
+#label4 {
+  font: expanded oblique xx-small serif;
+}
+
+#label5 {
+  font: 20mm '21st Century';
+}

diff --git a/testsuite/css/style/font.nodes b/testsuite/css/style/font.nodes
index ef23f94007154ca2d87f0c8be378909186edab3e..1ed7e0172c5b691ff3eb6e0b2e17e4aae8fc6179 100644 (file)
--- a/testsuite/css/style/font.nodes
+++ b/testsuite/css/style/font.nodes
@@ -1,3 +1,7 @@
+fount font weight: bold
+fount font style: italic
+fount font stretch: expanded
+fount font style: oblique
 [window.background:dir(ltr)]
   decoration:dir(ltr)
   box.horizontal:dir(ltr)
@@ -8,5 +12,33 @@
     font-weight: normal; /* font.css:2:25 */
     font-stretch: normal; /* font.css:2:25 */
 
-    label:dir(ltr)
+    label#label1:dir(ltr)
       font-size: 8.3333333333333339px; /* font.css:6:20 */
+    label#label2:dir(ltr)
+      font-size: 13.333333333333334px; /* font.css:10:34 */
+      font-family: "Cantarell", "sans-serif"; /* font.css:10:34 */
+      font-style: normal; /* font.css:10:34 */
+      font-variant: normal; /* font.css:10:34 */
+      font-weight: normal; /* font.css:10:34 */
+      font-stretch: normal; /* font.css:10:34 */
+    label#label3:dir(ltr)
+      font-size: 8px; /* font.css:14:33 */
+      font-family: "monospace"; /* font.css:14:33 */
+      font-style: italic; /* font.css:14:33 */
+      font-variant: normal; /* font.css:14:33 */
+      font-weight: bold; /* font.css:14:33 */
+      font-stretch: normal; /* font.css:14:33 */
+    label#label4:dir(ltr)
+      font-size: 8px; /* font.css:18:39 */
+      font-family: "serif"; /* font.css:18:39 */
+      font-style: oblique; /* font.css:18:39 */
+      font-variant: normal; /* font.css:18:39 */
+      font-weight: normal; /* font.css:18:39 */
+      font-stretch: expanded; /* font.css:18:39 */
+    label#label5:dir(ltr)
+      font-size: 75.590551181102356px; /* font.css:22:27 */
+      font-family: "21st Century"; /* font.css:22:27 */
+      font-style: normal; /* font.css:22:27 */
+      font-variant: normal; /* font.css:22:27 */
+      font-weight: normal; /* font.css:22:27 */
+      font-stretch: normal; /* font.css:22:27 */

diff --git a/testsuite/css/style/font.ui b/testsuite/css/style/font.ui
index f1b397c08ccb880b8de24f2e96a0420128c29b13..2428218086b0ebb67ee5bbcc495bfa02372da2ca 100644 (file)
--- a/testsuite/css/style/font.ui
+++ b/testsuite/css/style/font.ui
@@ -10,6 +10,35 @@
         <child>
           <object class="GtkLabel">
             <property name="visible">True</property>
+            <property name="name">label1</property>
+            <property name="label" translatable="yes">Hello World!</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="name">label2</property>
+            <property name="label" translatable="yes">Hello World!</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="name">label3</property>
+            <property name="label" translatable="yes">Hello World!</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="name">label4</property>
+            <property name="label" translatable="yes">Hello World!</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="name">label5</property>
             <property name="label" translatable="yes">Hello World!</property>
           </object>
         </child>